merge vt. 吞没,吸收;使消失(在…中) (in; into); 【法律】合并(公司等)使并入,使结合,融合 (into; with)。 All fear was merged in curiosity. 在好奇心驱使下忘了一切恐怖。 vi. 被吞没,被吸收,收入,消没在;合并,并入。 The twilight merged into darkness. 薄暮已消失在黑暗之中。 merge with the masses 同群众打成一片。
Its concept of a conflict is purely textual , arising when two changes to the same base file are near enough to spook the merge command 其冲突概念纯粹是文本意义上的,当对于同一基本文件的两个更改时间上非常非常接近,从而使合并命令受到干扰时,就会发生冲突。